Cleaned it up a lil