refactoring to new Elm version - part 1