Line fixed. Some refactoring