Improvements in the default value
Improvements in the default value
Remove unnecesary code