Cleaned up some dumbness.