Small class name change
Some minor fixes and clean up, added a defualt value