Refactored Shell tutorial