Turn charging indicator into a string so it works, fix tabbing to match coding style