@Tim Bozeman I'll go through code and will add suggestions