code cleanup and adding todos