Clean up, pragma marks and organization.