Clean up and add docs