refactoring leads
refactoring leads
refactoring metadata
Putting back classes when not in silent mode
Refactoring body classes