Improving encapsulation for default parameters and tweaking the default values to look a little better.