csrf token macros was fixed
refactoring