Refactorized some method calls to a static helper class and included more Activity Results.