Refactorization/engines

Trailing whitespace detected.