Merge pull request #4 from dustismo/feature/cleanup

refactor and cleanup
update for other package refactors.  clean up