Library partial refactoring

Line is too long. [86/80]