Better readability and maybe a fix for Yahoo! Bug