clean code fix
Some clean & mx-2.0 fix