cleanup/clarification