Code refactoring

`assert()` do we plan to have it on production? :joy_cat: I see an influence made after Mix's e-mail :+1: