Refactor/dicty documentation