Finish refractor-ed components with variable   and full tokenized
with uni-tests and dirty code.