Code cleanup
Fixing issue with default values