reformatting begins

OK, lets see if I did this right.  
These can be removed