Cleaned up a bit.