Refactor wercker