add next TODOs + code formatted