Style fixes
Some more style fixes