Is a default 'None' type needed here?  Same with some of the others below?