Simple cleanup

[glesica]

This is mostly cleanup to get the code in a state that makes it easier to continue working on, but without making any changes that we can't be pretty confident about.