saltstack/salt — pull request #12068 by techhat (2014-04-17 12:36:05+00:00)
Title: Cleaning up code as per @s0undt3ch

Addresses comments made in #12060.