nat: improve type safety and remove unused param