Library partial refactoring

Line is too long. [83/80]