Cleanup + doc