Cleanup

`pbt check` was complaining a lot about `pbt`'s code. I mostly fixed that.