Formatting plus micro improvements

@ggrossman