Restructured and Refactored