whitespace cleanup
renames