Cleanup for better readability.