Some more code cleanup for our own Battery