cleanup
clarifications
whitespace