reorganize handlers