Merge "Cleaned up class variable scope issue."