Cleanup code and added a plugin.