Fix generator detail + coding style