small _prepare_forward clean up
Merge pull request #452 from chdinh/master

[maintenance] small _prepare_forward clean up