nvda

a4a8df65 - Clean up helper method and add typing