cleaning up todos
more todo cleanup