Refactorization/engines

Line is too long. [90/80]