Updated formatting and made some minor fixes