Refactor activity helper WIP