#207 Formatting