some cleanup and method renaming
Merge pull request #10 from adampickeral/package_cleanup

some cleanup and method renaming