some cleanup and clarification