*removed logic from activity1 base

*cleaned up code, added comments