Even more style fixes (getting better!)