Refactor #184 for less redundant code
2 files changed