Some minor clean ups for #137