task refactor :construction: