Removed Duplication (code quality)