Small refactoring + documentation update