I reformatted this class. Seems it caused, lots of red and green. Maybe I should have kept the original on this pull. I might come back and do that if you want?