minor todos cleaning