Clean up and tidy comments