Cleanup and adding more docs