Moving with wasd
refactoring