WASD keys refactor