Added additional helper tools and more documentation
Code cleanup