refactor some code + add intercom user hash