Battery Friend clean up and fix