- Remove unused variables - Fix variable name typos - Use x() and defaults() to fix undefined index - Add back uninitialized variables