Make things even DRYer

Signed-off-by: Eddie Ringle <eddie@eringle.net>
Remove averaging

Signed-off-by: Eddie Ringle <eddie@eringle.net>