Fix Code style - again