A tad more formatting
Some method refactoring..
More massive method refactoring and simplification
Extractor method refactor
Capacitor method refactoring
Merge pull request #12 from samrg472/master

Reduction of excessive casts and refactoring