cleanup, todo added