START of REFACTORING

(simplifying things)