[WIP] Refactoring

Line is too long. [81/80]