cleanup, comments and a TODO
cleanup