Cleaned up some...