cleaned comments and spacing