Refactoring Executer module and specs