fix yet more style violations