Cleanup and document future work