Minor refactoring

For more gameplay later.