Data Structures Overhaul - Initial Cleanup 2