Refactor all.ViewController