Refactorization/engines

Line is too long. [81/80]