Fix style - first steps