code cleanup, support for plain token added