small dry-ness tweaks
Merge pull request #20 from iamntz/dry

Small DRY tweaks