Clean up to improve readability.