refactoring player location to be more clear and match