Code refactoring
Interactive shell