Cleaned up almost everything.