lots of cleanup
minor clarification