Refactorization/engines

Line is too long. [87/80]