added TODO; plus cleanup