Some more style fixes

No logic changed