Minor refactoring to the base activity
Replaced java markdown with bypass