Rename for clarity

Signed-off-by: Aram Price <aprice@pivotallabs.com>
Single quotes ftw

Signed-off-by: Aram Price <aprice@pivotallabs.com>
Fix issues: dead code, interpolation, unsed vars, conditionals + assignment

Signed-off-by: Aram Price <aprice@pivotallabs.com>
Single quotes

Signed-off-by: Aram Price <aprice@pivotallabs.com>
Remove unused code

Signed-off-by: Aram Price <aprice@pivotallabs.com>