Refactor some long methods
Add missing parameter
Assigning fix