Update ViewController for Swift changes