Formatting and Draios updates