cleanup and clarification