Alex: minor refactor