refactored token, forms, display messages