style changes following some of @cboutet's remarks