Minor changes to various scripts

Summary:
- Don't use type coercion unnecessarily
- Minor formatting improvements
- Better choices for variable names

Test Plan: Eye-ball it

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D9972