cleaning up variable names
simulator chages
simulator chages