Tweak coding standards.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Renaming configuration, simplifying.

Signed-off-by: Ben Corlett <bencorlett@me.com>