Cleaned it up a ton.