BS-11040 clean code