[WIP] Refactoring

Line is too long. [94/80]