Cleaned it up a bit since last time.