challoc refactoring