A lot naming conventions applied, TODOs.txt updated