removed duplicated code
2 files changed