Commit changes per feedback from brooks

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
Stylistic changes to conform to surrounding code

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>