more style fixes, whitespace