Clean up some code
Merge branch 'master' of https://github.com/zspector/lets-get-quizzical