Data Structures Overhaul - More Cleanup