Refactor some of the gameplay