Minor clean up and formatting