Cleaned it up a bit more.