Added BatteryIndicator, cleaned code