cleaning up todo's