Cleanup and doc development