did some refactoring to rename things based on name change in lval struct