Style & nit fixes