issue-3268 Small code cleanups