Refactoring parsed lines