Refactorization/engines

Use def with parentheses when there are parameters.