update formatting and made a few changes