Solved minor todos
Moved token into body