Code Tidy.

Small blitz on all code in the plugin.