Cleaning up some of the autogenerated stuff a bit