Moved some more whitespace around