clear whitespace

Change-Id: I80db086d1833b69c97ed824633d9167005336325
Moving stuff around