Library partial refactoring

Line is too long. [93/80]