Refactoring codemuncher