Publica parser, small refactor