Cleanup some whitespace