Cleaned upp a little more...