Cleaned up 2 methods and reorganized setup methods to fix singleton issue