Issue #115 Minor simplifications