Cleanup + documentation