Refactorization/engines

Line is too long. [85/80]