Little Attempt to Re-Factor Main Activity