[refactoring] added some comments and made activity name clearer