Comments and slight refactor for issue #14