Added and corrected comments, cleaned up spacing