Whitespace fixes / code re-ordering