Code cleanup

In case of String, you should use empty string to denote default value.