cleanup and clarifying comments