Docs and exec refactoring