ParseManager Clean up, structural improvement