Refactoring + Player modelled