Whitespace
More improvements