@1aurabrown => Removes duplicated code

Tests will be added for this in #333.

Fixes #311.