fixed duplication, method-complexity smells