More on fixing style