VE-1296: Minor code reformatting