Cleanup for readability and consistency.