Reorganise init, remove sudo-edit (use advice instead)