slight refactor
Merge pull request #11 from erictip/minor_tweaks

Minor tweaks