Moved Method getCharge and Replaced Conditional with Polymorphism