Cleanup the vala code of gtk3 panel and tool by: