Komodo 8 5 Code Refactoring