Formatting and removing some comments
Corrected some indentation and removed some comments containing old code.