Clean up lists, indentation, levels, minor reword