Cleaning up slightly.