Improve program description
Remove unnecessary factorization of forwarding functionality