Library partial refactoring

Line is too long. [101/80]