Refactorization/engines

Line is too long. [107/80]