Slight restructuring for consistency and forward-looking organization