Refactoring + Code simplification