VE-1340: Minor code formatting adjustments