Styling and reordering code