Cleaned up charge state
Cleaned up