More cleaning up and formatting