Cleaned up various things.