Refactoring on charges