bit more cleanup
small changes and comments