Workmanship Refactoring