Initial code clean-up (ha!) and commit

If you’re not embarrassed then you’ve waited too long