--minor refactor