Another little refactor for activities