Small refactorings for Color Match game