refactoring focus to single method