More refactoring - less code - more modular