Clean code, refactor classes, improve conception
