Refactored ViewController
Merge remote-tracking branch 'origin'
Refactored ViewController