#3 Formatting corrections