Refactoring. Parsing was improved