cleaned it up a bit more