Reorganized code [2]

Got rid of some commented code
Rewrote some comments