Cleanup and compared to tutorial.

SHOULD work but who knows…