Fix some formatting (new lines on collapsed single-line conditionals,
new lines for opening braces).
Split some parts of UpdateBoundingBox into multiple lines. Also,
fix issues causing failure on Lint.
Merge pull request #990 from rohit-n/fix-formatting

Fix formatting