Refactorization/engines

Use 2 (not -15) spaces for indentation.