Cleaned up, I think