Added movement, and meaningful names to lines