Cleaned up the view controller