Another refactoring of modules. Minifying steps to function execution