Refactor to fix bugs
Refactor controller