Code style fixes, formatting fixes