did some cleaning, wrote TODO, ready for next
did some cleaning, wrote TODO, ready for next