Little refactor for activities