Some progress made on cleaning up vision controller.