cosmetic changes, removed TODOs