Fixed it up a bit.