Refactor, useless maps turn into lists