Cleaning up v1
Cleaning/Documenting