Library partial refactoring

Line is too long. [117/80]