Complete tutorial and clean up code