Feature/refactor humanize

#50