Minor cleanup #27