Housekeeping

Mostly comment and some indentation and spacing...feel free to edit and such