Cleanup, move map data into map struct
Merge branch 'master' of https://github.com/LordMonoxide/tripping-octo-bear