Refactor
syntax
html generation
remove unused functions
Refactor sample
Merge branch 'refactor'