Remove type None, 'str' is now default type