changed battery struct
more cleanup