Refactored player a bit more