O5m format: small code style issues
Data parser: intermediate progress