Destination code fix

Destination print and saving functions related to else clause were
somewhat broken. Fixed.
Revert "Destination code fix"

This reverts commit 28a44d1edfcb25dcc09a6980a16b582ff4dcec8d.
Small code cleaning
Merge pull request #30 from Tatsuya-Nonogaki/master

Small code cleaning