Refactor code and added right collision check