diff --git a/AchievementInfoApplication.lua b/AchievementInfoApplication.lua
index 8403749..079498a 100644
--- a/AchievementInfoApplication.lua
+++ b/AchievementInfoApplication.lua
@@ -50,7 +50,6 @@ function AchievementInfo.onAchievementUpdated(eventCode, achId)
     local percentageStepSize    = AchievementInfo.settingGet("genShowUpdateSteps")
 
     local link = GetAchievementLink(achId, LINK_STYLE_BRACKET)
-    local name, description = GetAchievementInfo(achId)
     local catName = "/"
 
     if categoryId ~= false then
@@ -61,14 +60,14 @@ function AchievementInfo.onAchievementUpdated(eventCode, achId)
 
     local numCriteria = GetAchievementNumCriteria(achId)
     for i = 1, numCriteria, 1 do
-        local name, numCompleted, numRequired = GetAchievementCriterion(achId, i)
+        local description, numCompleted, numRequired = GetAchievementCriterion(achId, i)
         local tmpOutput = ""
 
         if i > 1 and AchievementInfo.settingGet("genOnePerLine") == false then
             tmpOutput = tmpOutput .. ", "
         end
 
-        tmpOutput = tmpOutput .. name .. " "
+        tmpOutput = tmpOutput .. description .. " "
         tmpOutput = tmpOutput .. AchievementInfo.calcCriteriaColor(numCompleted, numRequired) .. numCompleted .. "|r"
         tmpOutput = tmpOutput .. AchievementInfo.clrDefault .. "/" .. "|r"
         tmpOutput = tmpOutput .. AchievementInfo.clrCriteriaComplete .. numRequired .. "|r"
@@ -163,13 +162,11 @@ end
 -- Get the correct achievement category
 function AchievementInfo.getCorrectAchievementCategoryId(achId)
     local previousAchievementId = GetPreviousAchievementInLine(achId)
-    local categoryId            = 0
 
     if AchievementInfo.checkForValidCategory(achId) == false and previousAchievementId ~= 0 then
         return AchievementInfo.getCorrectAchievementCategoryId(previousAchievementId)
     elseif AchievementInfo.checkForValidCategory(achId) then
-        categoryId = GetCategoryInfoFromAchievementId(achId)
-        return categoryId
+        return GetCategoryInfoFromAchievementId(achId)
     else
         return false
     end
diff --git a/AchievementInfoSettings.lua b/AchievementInfoSettings.lua
index 2f007fc..14fb0d8 100644
--- a/AchievementInfoSettings.lua
+++ b/AchievementInfoSettings.lua
@@ -122,10 +122,9 @@ function AchievementInfo.createSettingsPanel()
 
     -- Add categories dynamically
     local numCats = GetNumAchievementCategories()
-    local catCount = 1
 
     for i = 1, numCats, 1 do
-        catName, numSubCats = GetAchievementCategoryInfo(i)
+        catName = GetAchievementCategoryInfo(i)
 
         table.insert(optionsTable, {
             type = "checkbox",