Code review fixes + property value gets deleted when it gets its default
value back.