Small cleanup on the ViewController