Fix errors and remove nested list due to errors.