Clean up indents and util methods. Added TOC to Readme