refactored remaining tutorials