Mini cleanup and updated battery script