Whitespace cleanup

WE-48