ViewController: Cleaned up a bit