Cleaner syntax parsing, added chars