Small TODO improvements, some cleanup