Issue #79: just refactor coding