Small cleanup after PR #13