Cleanup

Making it easier to see the default values in initialization.