Hacky fix for incorrect token amounts being sent
OCD
More OCD
Code clean up