Cleanup + enhanced documentation