Refactor and add to player validations