Refactor in an effort to make package more 'Pythonic'.