Clean all warnings and fix coding style

[stfufane]

Hi, Thanks for this cool plugin, I'm using it and noticed it could get a bit of polish with the coding style and remove some code repetitions .

Let me know what you think. I did not notice any regression by doing these changes, I'll let you judge if it looks good to you.

Cheers