Some docs and cleanup