cleanup
Added setDefaults()
cleanup