Moved controller callbacks into scope, making testing easier and minimizing size of passed options object