Cleanup, clarification