cleaned comments and formatting