REFACTORING + SIMPLIFICATION