MINOR: moved some stuff around to get rid of the space