Cleaning up version 1
Better documented for v1