activity helper refactored + specs