Refactor player move functions somewhat