Tweaks to code formatting
Tweaks to code formatting