handlers refactor
momoko return