Clean up code

While we at it, let's get rid of this camelCase biz.