cleaned the mess
changed a lot