More refactoring
documentation