rearrange spacing and commenting