Small refactor
Introduce StopWatch
Refactor
Remove unnecessary comments / code
refactor controller - would still like to add tests here