A little more whitespace removal