making movement code readable

see #5