"minor" refactor