Code style refinements

Better use of space and { placement