Data structure cleanup

Слиты nikitronn запросил слияние data_structure_cleanup в master

Created by: ly29

Not quite ready for merging, please test if you have time.