Minor-3

- Replaced "self" by "mlc" (remove self in functions)