Move to new brace standard
fix double spaces
Add ISO8601 Support