Some cleanup (expecially in CSS)