MSE-11 Clean code pass 2