rearrange file and indent properly