Removed some bonus trailing commas and dupe vars