Documentation, cleanup on collector