Refactor personalcharge