public activity + spec refactor