Code cleanup + fix battery bar summaries