Minor source code clean up