Code Clean-Up

Will branch to include scene manager.