Removed extraneous comments
Split classes into header file