HCSVLAB-501:  Minor cosmetic changes.