cosmetic refactor