Review and reformat
More work on autopilot