changes from internal feedback

Signed-off-by: Kirk Linkletter <kirk@theantimatter.com>
minor changes to styles

Signed-off-by: Kirk Linkletter <kirk@theantimatter.com>