Updates coding style definitions

o Change from tabs to spaces
o Refined clean up rules to ensure that certain
  things required by serialization are left intact