Cleaned up integration on mainActivity