Completely changed my mind about the shift in code structure