Refactorization/engines

Line is too long. [99/80]