Clean out variables, align comments