rename file to avoid namespace collision
refactor code by adding "token checkers"