Refactorization/engines

Line is too long. [100/80]