Applied suggestions from @tleyden for PR #363