Fixed parser for unformatted files