First pass of style cleanup

Signed-off-by: Nick Fetner <nickfetner@gmail.com>