BZ-12892: Updating code format