expunged duplicated tokens <number>, <integer> etc; general tidies