refacor - code metrics issues