Little refactoring of turbine