Game play code refactoring completed