hellomap minor refactor