clean up TODOs and vim