minor changes in HOL - starting app refactoring