Formatting cleanup suggested by lint