Address issues per review by Steven Danna.

Signed-off-by: Leif Madsen <lmadsen@thinkingphones.com>