Refactor the draw method as follows: Currently the draw method has several responsibilities as it must move