Code style cleanup

1.  Fixed tabs and double spaces to be 4 spaces
2.  split up parameters on method calls to get their own line.