Cleaned up quite a bit.