Data Structures Overhaul - More Cleanup 2