Rearrangement, condensing, and added name to license