Refactorization/engines

Line is too long. [91/80]