made changes per @wolf31o2 suggestions