Small refactoring
Decreasing CRAP by simplifying methods
Start big refactoring