Cleaned up autogenned methods