Refactor | Beverly | remove duplication, rename directionAsPoint to direction