Small cleanup: whitespace, simplification