Refactorization/engines

Line is too long. [96/80]