Chore: Replace class variables with instance variables

--------------------------------------------------------------------------------
Change-Id:     If2bb5abe40263b1ea5001fc3f52576f5dc602e5e
Signed-off-by: Jeff Felchner <accounts+git@thekompanee.com>