Further cleanup and cosmetic improvement