REDCORE-189 Format and standards fixes