Update clean target
Fix namespace syntax issues
Fix syntax to reflect actual usage of fields
Fix map example