cleaned up comments and formatting in .h