Fixes #311.
Merge pull request #347 from artsy/dupe

@1aurabrown => Removes duplicated code