better markup
update tests and remove old code
improve the markup and close #9