[task] refactoring for self administration