Todo & some formatting