Minor refactoring incl. mozorov