Minor source code tidying