remove right arrow and refactor