Parsing refactoring done (code first)