Fix safing behaivour
Fix indenting
Remove single quotes
Fixed children