fix merge mistake - minor refactor