preliminary whitespace cleanup