[CT-27] Clean code