Player X movement, code refactor