just a few minor slimdowns