Charge form refactored