Finally take @maxsnew's advice. I think this is nicer now.