cleaning up variable names