Refactorization/engines

Use 2 (not 0) spaces for indentation.