Some more rearranging to clean up the head area