Some cleaning up after changing variable names