CON-862 Code formatting