Code cleanup

Removed commented parts.
Aligned indentation. Need to set the guidline for indentation soon.