Cleaned up the code to remove lines I had commented out/are no longer necessary