Do not hardcode arguments' number
Refactor and fix parameters