refactor - do mor in initializer list