some cleanup
more feedback