cleanup, whitespace