fix function properties
simplified applying the tokenizers.
Merge pull request #1 from nielsmadan/fix_function_properties

fix function properties