last of the comment refactoring from toxcore