[#671] A little cleanup