Removed comment
Moved some log statements
Tiny controller refactor