Cleanup and re-format