Better Batterystyle

Change-Id: I2d5e4dae775a10b8676c60b87467602c246482ae