clean demographics as well + code cleaning