cleanup
clarifications