minor cleanup and style twearks