Updated variable names, fixed whitespace