Cleanup

Removal of commented out lines, fixing tabbing, etc.