(minor refactor)