Cosmetic: enhance constructor
Csometic: done model-presenter refactoring