refactor/cleanup
more cleanup and updates readme