cleaning up comments and formatting