general cleanup of whitespace