MINOR: clearer to have fewer lines flying around.