Cleaned up lots of code. Used map destructuring properly.