Cleaned up stuff a bit.