-refactoring, improvements, documentation