little refactoring of pengwin