Slight refactor
Merge pull request #8 from mzikherman/master

@mzikherman => Slight refactor