Tokens - sort methods

private methods should have been kept at the end of the class