refactoring / updated Form Token handling