[CHG] refactoring, less code