REFACTOR. First steps applying SOLID