Refactoring. Adjusting visibilites