Documentation + method refactoring