changes that had been missed being saved before the last commit.
Cleaning up the code from refactor when chaning data structures.