[US128.2] Clean code