[MOD] Clean code review