Clean up code
Update tutorial