Clean up code, change map, and add todo comments