Comments username, Refactor plugin.