Small minor cleanup