Fixing typos and variable names