Clean up formatting + comments