Refactor all