Refactored the Batteries code