Some style fixes for #13