Refactoring artifact, thanks