House cleaning

Changed indents
Compacted a few lines
Changed order of attributes to be consistent