Some code cleanup (string.IsNullOrEmpty)