More formatting and cleaning up