cleanup, clarifications