VE-422 Code formatting