removed redundant tags, improved docs and testing functions