Code Coverage: more refactoring,

Refactoring methods to less responsibility