Refactor arrow drawing