Cleaned up some more #2.