removed all var-initial underscores