Remove duplicated code
11 files changed