VE-1178 Code formatting