Cleanup so it looks like others.