Make cosmetic changes and update TODO