cleaned up batter plugin