Refactorization/engines

Line is too long. [89/80]