whitespace, cleanup