Documentation, light refactoring