Quick cleanup. Left some autogenerated derp in.