[WIP] Refactoring

Line is too long. [88/80]