Refactorization/engines

Line is too long. [174/80]