refactor plugin, and remove short tags