Documentation
Little refactoring