Some more cleaning

Hope it's getting better