Refactor minor changes to paste-plugin for better coding standards conformance