more explicit var names & types

also None was already the default