SOS-1138

fixes after source formatting