Minor clean up

Nothing controversial here

CC @phamann