Improve unify code + solve #37