Improve joke plugin