Refactorization/engines

Line is too long. [83/80]