Progress on activity refactoring