Fixed whitespace
Part 2: Imported variable and library changes from part 1
Part 2: Imported deconstructor, tokenizing, and variable changes from part 1