core whitespace cleanup