Refactor plot functions

[Enchufa2]

I'd like to give this a try before the release.