Tweaked what was auto-generated to look slightly more sane