Tad bit of cleanup and todos