Added editing and cleaned up a fair amount of one character variables