- additional refactoring of previous changes