Fixed it up a little