Refactor whenever task