cleaned up todo's