Some minor changes

This might prepare the plugin for configuration option in the future