Refactorization/engines

Line is too long. [104/80]