Remove lineTo
Factor out