cleanup of batterystyle

Change-Id: Ib9456eb64a84a6632a4ef43edb5652273aed1244