cleaned it up a little