Comment and proper formatting