Restyle and reorganize.