Some chill refactoring