Removed code duplication.
2 files changed