Some cleanup for readability.