Refactorisation and changing method visibility