Small tweaks
Merge pull request #63 from montehurd/refactor

Small tweaks