Cleaning up code after second run through tutorial