refactoring comet