Code grooming, TODO list added