pluginner: code cleanup