fixed method-complexity smells