Ensure Integer refactor