Whitespace 2

OK, I did you a service and cleaned everything.  It wasn't too bad.