Code refactoring, ResultActivity update