BS-11040 Clean code