code cleanup - not use NULL macro