Clean up some view controller initializers

Make the view controller initializers a little saner.