Cleaned the whole thing some more.