Formatting changes, and added mCarriesCharge to init.