Cleanup battery style code

Change-Id: I9f44bf79e193ee820475f4e83ee39c9a22e6b831