A little simpler and better