successful further refactoring :smoking: