fix skip 2nd line in read + refactoring names