clean up and clarification