Refactor module