[OCD] Clean up, Tidy up, TODO's