Cleanup battery style code

Change-Id: I50c347af17ce0ddef1f887586d0aca54843b8e63