Refactor activity methods