Doc for Manager and very light refactoring