Refactored @current_player switch to 1 line
Refactored code cleanup
Merge branch 'refactoring'