More review: Code cleanup due to Quad. Thanks!