Cleaned this up a little...