indentation and reordering