Cleaned up some in the gameplay ns