rearrange and hlint