refactor some over ray action