Cleanup for readability