Fix bad variable.  Remove unnecessary padding.