minor re-factor - Issue #118