A little more elegant