fixed duplication smells