cosmetic + refactor