Refactorization/engines

Line is too long. [98/80]