Cleaning up code as per @s0undt3ch

Addresses comments made in #12060.