cleaned up some variable names and white space