Some cleanup and better commenting
Changed comments