Another minor cleanup