Found a better way to instantiate the class

Also cleaned up some code I had commented out and accidentally checked it in.