Cleaned up some stuff in viewcontroller