Refactored

Greatly simplified/reduced.