MainActivity ReOrganisation and cleanup