cleanup and clarify