Refactoring and adding Runner Sample