General style clean up