Refactor controller
Refactor Parser