Refactorings and add tell dont ask
reduce visibility of methods refactoring