Prettify and organize