IM** - Fix self-documenting feature. Cleanup