Cleaned up stuff.