Library partial refactoring

Line is too long. [129/80]