Updating documentation / Refactoring