Library partial refactoring

Line is too long. [97/80]