fixed method-complexity smells (extracted methods) [ci skip]