A few (nitpicky) modifications against your branch