minor refactor for consistency.