Refactorization/engines

Use 2 (not 3) spaces for indentation.