MAking the player cleaner