pylint cleaning
Rework data structures