Comments and formatting 2.0!