Clean up logic. Add basic handling for computer player, though AI logic still needs implementing.