- lines count refactored