*Fixed instantiation issue with passing data between view controllers
*Cleaned up some code
Merge branch 'hotfix/instaniationBug'