Code Clean Up

Both versions of game appear to be working (there might still be a bug
somewhere though).